src/api/providers/zoo-gateway.ts (2)

61-70: ⚖️ Poor tradeoff

Consider passing headers to parent instead of recreating client.

Overriding client via (this as any) bypasses type safety and creates the OpenAI client twice. If RouterProvider doesn't support custom headers in its constructor options, consider extending it to accept a defaultHeaders parameter, which would avoid the double instantiation and the unsafe cast.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/api/providers/zoo-gateway.ts` around lines 61 - 70, The code recreates
the OpenAI client via (this as any).client = new OpenAI(...) which bypasses
types and double-instantiates the client; instead extend RouterProvider to
accept a defaultHeaders (or openAiOptions) parameter and pass enrichmentHeaders
and options.zooSessionToken into the parent constructor so the existing client
instance is created with the correct headers; remove the unsafe cast and the new
OpenAI(...) call in ZooGateway (or the class containing this.client) and update
the parent constructor signature (RouterProvider) to merge DEFAULT_HEADERS,
enrichmentHeaders, and options.openAiHeaders when constructing the OpenAI
client.

---

109-111: ⚡ Quick win

Set tool-related parameters only when tools are provided.

When tools is undefined, tool_choice and parallel_tool_calls should also be omitted. Some OpenAI-compatible APIs may error or behave unexpectedly when these parameters are present without tools.

♻️ Proposed fix

 		const body: OpenAI.Chat.ChatCompletionCreateParams = {
 			model: modelId,
 			messages: openAiMessages,
 			temperature: this.supportsTemperature(modelId)
 				? (this.options.modelTemperature ?? ZOO_GATEWAY_DEFAULT_TEMPERATURE)
 				: undefined,
 			max_completion_tokens: info.maxTokens,
 			stream: true,
 			stream_options: { include_usage: true },
-			tools: this.convertToolsForOpenAI(metadata?.tools),
-			tool_choice: metadata?.tool_choice,
-			parallel_tool_calls: metadata?.parallelToolCalls ?? true,
+			...(metadata?.tools && {
+				tools: this.convertToolsForOpenAI(metadata.tools),
+				tool_choice: metadata.tool_choice,
+				parallel_tool_calls: metadata.parallelToolCalls ?? true,
+			}),
 		}

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/api/providers/zoo-gateway.ts` around lines 109 - 111, When building the
request payload in zoo-gateway.ts (around the object using
convertToolsForOpenAI), only include tool-related keys when metadata?.tools is
present: call convertToolsForOpenAI(metadata.tools) and, if that returns a
non-empty array, set tools, tool_choice (from metadata?.tool_choice) and
parallel_tool_calls (from metadata?.parallelToolCalls ?? true); otherwise omit
tool_choice and parallel_tool_calls entirely. Update the payload construction
logic to conditionally add these properties instead of unconditionally setting
tool_choice and parallel_tool_calls when tools are undefined.

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

src/api/providers/__tests__/zoo-gateway.spec.ts (1)

183-197: ⚡ Quick win

Consider fully consuming the stream in assertion tests.

The test only calls .next() once to trigger the request, but doesn't consume the full stream. This pattern appears in several tests (lines 186, 205, 218, 235). While it's sufficient to verify the request shape, fully consuming the stream would also verify that:

• The stream completes without errors
• No unexpected chunks are emitted
• Cleanup/finalization logic runs correctly

Consider using a pattern like:

const chunks = []
for await (const chunk of handler.createMessage(...)) {
  chunks.push(chunk)
}
expect(mockCreate).toHaveBeenCalledWith(...)

This is a recommended improvement for more robust test coverage.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/api/providers/__tests__/zoo-gateway.spec.ts` around lines 183 - 197, The
tests call ZooGatewayHandler.createMessage(...) and only invoke .next() which
doesn't fully consume the async iterable; update the test cases (the spec that
uses new ZooGatewayHandler(mockOptions) and mockCreate) to fully iterate the
returned async generator (e.g., for-await ... push chunks into an array) so the
stream is drained and completes before assertions; then assert mockCreate was
called with the expected headers and optionally assert the collected chunks/that
iteration completes without throwing to ensure cleanup/finalization runs.